(rmail-forward): Delete trailing blank lines.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 633960f913e71c6cdb3eb12bffc939fb74c701a5..03d9a52b689cb4f996c87910b020493baff8f7d0 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2253,6 +2253,11 @@ see the documentation of `rmail-resend'."
            (forward-line 1)
            (insert "------- Start of forwarded message -------\n")
            (insert-buffer-substring forward-buffer)
+           (let ((end (point)))
+             (skip-chars-backward "\n")
+             (if (< (point) end)
+                 (forward-char 1))
+             (delete-region (point) end))
            (insert "------- End of forwarded message -------\n")
            (push-mark))))))
 \f